From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Fri, 28 Dec 2012 08:20:18 +0000 (-0500)
Subject: keyring: Actually ensure sensitivity when the keyring dialog opens
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5137
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=75d44dca6bbc39a48320952fe9aa04b3f70f8863;p=gnome-shell.git

keyring: Actually ensure sensitivity when the keyring dialog opens

I misunderstood how the control flow for the keyring worked.

https://bugzilla.gnome.org/show_bug.cgi?id=690895
---

diff --git a/js/ui/components/keyring.js b/js/ui/components/keyring.js
index ff59fa3e3..34d7b6dfd 100644
--- a/js/ui/components/keyring.js
+++ b/js/ui/components/keyring.js
@@ -171,12 +171,14 @@ const KeyringDialog = new Lang.Class({
     _onShowPassword: function(prompt) {
         this._buildControlTable();
         this._ensureOpen();
+        this._updateSensitivity(true);
         this._passwordEntry.grab_key_focus();
     },
 
     _onShowConfirm: function(prompt) {
         this._buildControlTable();
         this._ensureOpen();
+        this._updateSensitivity(true);
         this._continueButton.grab_key_focus();
     },
 
@@ -185,12 +187,10 @@ const KeyringDialog = new Lang.Class({
     },
 
     _onPasswordActivate: function() {
-        if (this.prompt.confirm_visible) {
-            this._updateSensitivity(true);
+        if (this.prompt.confirm_visible)
             this._confirmEntry.grab_key_focus();
-        } else {
+        else
             this._onContinueButton();
-        }
     },
 
     _onConfirmActivate: function() {